Reverted r16699:

2007-09-09  Kristian Rietveld  <kris@gtk.org>

	Reverted r16699:

	2006-10-30  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_class_init): change left/right
	keybindings to collapse/expand rows instead of moving the focus
	cursor. (#105895, Brian Bober and others).

svn path=/trunk/; revision=18768

diff --git a/ChangeLog b/ChangeLog
index eaf18f643827bb7d0928d5bbbbad59e0f2767a89..bb2d6d569111264f0f65e2d5b01baa66c153447d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-09  Kristian Rietveld  <kris@gtk.org>
+
+       Reverted r16699:
+
+       2006-10-30  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): change left/right
+       keybindings to collapse/expand rows instead of moving the focus
+       cursor. (#105895, Brian Bober and others).
+
 2007-09-09  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8e21633cba2979bc1870728416c4dfe4d2c5caa9..7795cea30f7eb44c680eb74bdb9c9e07dfb12827 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1128,6 +1128,22 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                  GTK_MOVEMENT_PAGES, 1);
 
 
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "move_cursor", 2,
+                               G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "move_cursor", 2,
+                               G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               G_TYPE_INT, -1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, "move_cursor", 2,
+                               G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               G_TYPE_INT, 1);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, "move_cursor", 2,
+                               G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
+                               G_TYPE_INT, -1);
+
   gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_CONTROL_MASK,
                                 "move_cursor", 2,
                                G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
@@ -1174,17 +1190,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                G_TYPE_BOOLEAN, TRUE,
                                G_TYPE_BOOLEAN, FALSE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "expand_collapse_cursor_row", 3,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, FALSE);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, "expand_collapse_cursor_row", 3,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, FALSE);
-
-
   gtk_binding_entry_add_signal (binding_set, GDK_asterisk, 0,
                                 "expand_collapse_cursor_row", 3,
                                 G_TYPE_BOOLEAN, TRUE,
@@ -1251,10 +1256,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                G_TYPE_BOOLEAN, TRUE,
                                G_TYPE_BOOLEAN, FALSE,
                                G_TYPE_BOOLEAN, FALSE);
-  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "expand_collapse_cursor_row", 3,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, FALSE,
-                               G_TYPE_BOOLEAN, FALSE);
   gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
                                G_TYPE_BOOLEAN, TRUE,
                                G_TYPE_BOOLEAN, FALSE,
@@ -1263,10 +1264,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                G_TYPE_BOOLEAN, TRUE,
                                G_TYPE_BOOLEAN, FALSE,
                                G_TYPE_BOOLEAN, FALSE);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, "expand_collapse_cursor_row", 3,
-                               G_TYPE_BOOLEAN, TRUE,
-                               G_TYPE_BOOLEAN, FALSE,
-                               G_TYPE_BOOLEAN, FALSE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3,
                                G_TYPE_BOOLEAN, TRUE,
                                G_TYPE_BOOLEAN, FALSE,